Auto merge of #2348 - steveklabnik:gh2337, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 1 Feb 2016 22:04:19 +0000 (22:04 +0000)
committerbors <bors@rust-lang.org>
Mon, 1 Feb 2016 22:04:19 +0000 (22:04 +0000)
commit7330169feb3c2e7beb194fba10f2713699fd9396
tree8955378433d09c8033152fe1da1263c71a78dae7
parente9d0023cab4ffe5b31dc936b6d283fbee46930ad
parent8d5fbd1720b110171a831aca07dc5c825522328e
Auto merge of #2348 - steveklabnik:gh2337, r=alexcrichton

Fixes #2337
Cargo.lock
Cargo.toml